Fix CREATE_AVD.........................