Fixed keypad checker issues