Also two cosmetic changes. PR: 244000 Submitted by: Dries Michiels <driesm.michiels@gmail.com> (maintainer)