Same fixes as before, this time for cypher plugin