JH 3-7 fixes