Small fixes for production env