Fix a load of stuff to do with unicode