Fixes to solvation module and calculating solvation correction.