further compliance fixes