Feature/fixes needed for gremlin repl