Minor changes to allow for better REPL interaction