more scaling fixes