various compliance fixes