small fixes
merge