Added some more truncates following feedback from @shermozle