Fixed a lot of the audit issues