Couple of Kana related bug fixes.