Small fixes for commit 825ec2e regarding issue #7755