Fix some compiler warnings, mostly in Cypher
Merge pull request #3032 from systay/warnings

Fix some compiler warnings, mostly in Cypher