Some fixes for unicode support in changing maps.