And some keyboard handling bugs