VARIOUS fix and report fix