Fixes to interpreter.