Tweaks to context when in production mode