REPL fixes