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