Fix issues exposed by 'go vet'
Merge branch 'master' into linux