Fixed the minor scaling issues