domain bugfix and audit bugfix