A couple of minor toString enhancements