Autounattend fixes for WS 2008 R2 support