Fix keypad issues