Fix audit warnings