Checking in debugger code and fixes from Friday...