Some fixes
Merged