Fix keyboard behaviour
Fix warning