misc fixes for production