Fixed Audit issues