Scaling changes and various tweaks