Minor toString() fixes