Some fixes
merge