Various audit fixes
Merge pull request #49 from JustDuckItAll/audit-fixes

Various audit fixes