Several fixes
Updated
Fixes