Add ondemandX and fix pegasusQ compile