Fixes on the keyboard helper