Last round

More fixes, final round.