More fixes and more finals