compliancy tweaks