Compliance fixes -- NEED TESTING