Fix some scaling issues