Fix some VS debugger issues.