A couple of issues for HC4 demo