Various fixes.
More fixes.