Tiny updates
Merge pull request #4721 from timvandermeij/tiny-updates

Tiny updates