Fixed a few scaling issues