Update compliancy

Minor updates