MIFOSX-9: Audit related work
remove warnings.