More fixed to allow bguilding with texinfo 5