Passing fixes to deployment script to master