Fix trivial issues in PR#3305