More compliance fixes