Fixed some scaling problems