Fixing beanstalk issues