some fixes for target machine and some UTF stuff.