Updates Post Hatch Merge

Some changes to HRT made after merging code into Hatch.

Signed-off-by: shanesuofi <shanes@vandals.uidaho.edu>