Minor changes/correction after Pull Request merge.