Keyboard: Let's Split fixes (#3511)