Fixed Keyboard Issues