Some clean-up
unicode issues