Some fixes
-