Several more fixes for the Trr2k/Her2k rewrite