Fix
Fix
Fix
Several fixes