Fix up sanity check tool