Some more fixes.
More fixes.