Four Unicode fixes in discussion