Fixes as indicated in ChangeLog.md