Finals fixes