fix yet more scale related bugs