JK: More fixes.