Fixed some problems with attribute names that are too long.