Changed small issues noted when checking pull request 421