Error cleanups as reported from golint