- fixes for texinfo 5.x