Fixed toString() methods