further compliance fixes
further compliance fixes