JH's Dec 1 fixes...