Fixes to allow re-deployment.