More fixes.
misc