More fixes, whitespace issues