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