Deploy-related fixes