Updated HC

Two additions and an upstream issue report.