Fixing up the REPL