Compliance page fixes