Fixes to correct handling of most frequent form