7.x 4.2 fixes from Fuzion Repo