Fix audit issues, some left
Reduce warnings from audit