Fixed a few bugs introduced while modifying the code to the new design.
These bugs were noticed by Edward d'Auvergne in a post at:
https://mail.gna.org/public/relax-devel/2008-04/msg00011.html (Message-id:
<7f080ed10804030921h2703a004o65501fbd89cb08ed@...>)
