Repair: Keyboard issues