Keyhandler fixes