Some updates for production