d237: yinzanat and Jigoku fixes (#160 and #162) due to new general layout