Merge "Fix some issues with RefBase debugging."