More keyboard fixes