A few buffer switching key binding fixups