Scaling fixes, etc.