Fixes for production deployment