Small fixes
Merge pull request #1 from egbertbouman/release-6.1-GOLF

Small fixes