Fixes for non UTF-8 characters