Some fixes
Fix