Some fixes
More fixes