compliances fixes