Scale fixes