Fix up __str__ implementations