Fix demo.go bugs