Fix files to remove audit violations

Lots o' changes to get violations as low as possible.