some cypher fixes