Some fixes / changes to keyboard functionality.