Fix some golint issues