Minor cleanups; switch default to production mode