More fixes for international slugification.