Scaling fixes