More codeset metadata fixes