Fix a bit the interpreter code