Fix remaining golint complaints