Fixup toString methods