Keyboard bugfixes on Android