Fixing scaling issues