Further updates.
More fixes.