Fixes from the debugger.