Fixes as indicated in ChangeLog