Small fixes
More fixes