Misc undoing investigation fixes.