Some fixes.
More fixes.