Fixing bugs.

Mistakes made during HC3 to HC4 change.