Fix up vs golint