Tweak field sizes to not exceed MySQL's max key byte limit
Merge changes to SQL field size, migrations.