Further fixes for deployment.