Fixes to scaling