Improvements to scaling