Improved vcprompt OS/Arch handling