Fix shortcut-related errors