HTH: Minor fixes