4 fixes
merge