Fix some golint warnings