general scaling fixes