Fix scale problems