Minor bug fixes for production deployment