[patch] blead@25282 - VMS specific fixes. [2nd try]