more attempts at unicode fixes