Further tweak autoscaling (add safety zone)