misc fixes
 minor