Tweaks to make local and EC2 work the same way