[*] ADMIN minor changes according to new charset