Fixed texinfo 5 build errors