minor fixes
merge