Various fixes
Test