Work in progress, fixing error audit change events