Compliance level fixes