The paper is structured as follows: First, we present the theoretical background for calculating x-ray scattering from RDFs sampled from finite-size systems and introduce our new correction. Then, we briefly introduce two previously developed correction methods. We then test the performance of all the corrections on systems of increasing complexity, going from a simple Lennard-Jones liquid, to neat water, to a single-atom solute in water, before ending up with a many-atom complex solvated in water. Finally, we go into detail in analysing further contributions to the total x-ray scattering signal from solvent shells, before presenting a best-practices recipe for future forward modeling.