Minor: String output special case & compatibility fix
Return proper class name with __str__