Fixes for Elastic beanstalk