More fixes
Small adjustment