Some fixes
update