Fixing a few lint/vet issues