Fix errors from log files and add missing functions.
Merge branch 'master' into MNF

* master:
  Fix errors from log files and add missing functions.