Deal with some overlong names