Fixed bugs with the interpreter