Better compability handling to HPH 5.4 and Linux.