Merge "Some bugfixes in simple_deploy.sh"