This pair of ray fixes looks good to me, but since I don't use rays I'll wait for feedback from the list before committing. (In the meantime it'd be nice if you could resubmit the patches as attachments so that they don't get damaged by line-wrapping etc.) Thanks, --Adam