misc fixes
misc fixes