Fix some compiler warnings, mostly in Cypher