Restore (once again) my fixes from revision 1.20 that got lost in revision 1.25 merge. Approved by: re