Little opt out changes