Mostly failed attempt to fix scaling issues