Fixes to deployment