Bug 852185: correcting problems pointed out in the comments of the pull request