Minor fixes for production