More fixes
More improvements