VMS fixed in unified build