Small fixes to make it work on EC2