Fixes for better deployment.