Some small fixes and go fmt.