* misc fixes