Tweaks for REPL