Fixes
More fixes