Fixed up the way the frame scaling was handled (including adding gUM constraints).