Fix toString() methods