Further fixing of fatal errors.
Merge origin/master