Some more fixes for keyboard activity