misc minor fixes