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