Several more fixes from the recent reimplementation of Trr2k