Fix more audit warnings