Some changes to make uselang=qqx work properly