Quick changes to fix scaling