small fixes
mismerge