TDR2000 HIE and MSHS:  Fixing silly bugs