Fixed Scaling issues