deployment-fixes