minor fixes
merge
xxx