scale bugfixes