Missing changes from merge, also gofmt