misc fixes
merge