Minor tweaks and re-enabling autoscaling