Fixed some scaling issues