Fix keyboard problems