Misc. user consent improvements