tpcat: Fix everything...