Solvent control