minor fixes for non-xml