Fix more dodgy toStrings