Compliance fixes for the official repository