Fixed Keyboard bugs