Some fixes
Updates