Fixes to ensure attribute are audited properly