Various PatchInspector fixups.