Minor additions to 'Opt-out'