Clear up some FH2 regressions introduced new & old