Some modifications to make things deployable on ec2