Scaling improvements