Small changes to make the latest enhancements work in unicode