Fixes to deployment process