Fix build and go fmt