Fixing issues with beanstalk