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