Fixes for Windows provisioning