Fixed some keyhandler propogation bugs