Handle some stranger key combinations

Work on #18