HC4 regression fixes and demos