Fix #1 build errors + gofmt