Fixed a couple keyboard shortcuts