Further fixes for binary deployments