A couple of fixes for production.