Compliance tweaks