JH: Friday 9/12 fixes