Fix keyboard issues