Some tweaks (normalisation).