Fix up scale issues