Minor fixes to scaling