Consent fixes