1 more & a Unicode fix