Fixed scaling issues