Minor scaling fixes