Fixes, start option handling in the REPL