Batch update of specs and fixing a few regression issues on keypress.