Some golint fixes