Fixes after initial testing on EC2