[OE-3535] Scaling fixes