More fixes to on-screen keyboard