Some changes to the interpreter