Improvements to finalbuilder scripts for WIN81 support