Fix issue with selectItems only returning count.
Fixed build issues