Fixes for some issues seen with CS deployments