Fix audit complaints