Fixed build issues for ondemandplus
Fixed build bugs
Fixed build bugs