Various tweakings.