Bring keyMap back to life, fix some app.state regression