Fix issues in Keyboard refactor (mainly header-related)