Fixes
More fixes
Happy