Some toString changes