Fixed a few things that go vet was complaining about