Fixes to deploy tools