Fixes for escaped UNICODE