Bug fixes for deployment.