additional Unicode fixes during migration