Fixed final gazelle problems with ODD generation of the APS