Extend enum buffer sizes (bug #4943)