Fix build errors + gofmt