Fixed wait for cpt
Fixed compiler warning
Partial fix for unsupported scalar exp type during SPRAQL generation