Fix audit issues v2