Fix a few bugs occurring when users have opted out