Most fixes in place.