Some bug fixes around canvas keyboard shortcuts