Merge headswe TFR spectator fix