Some minor fine tuning.