Some keyboardfixes