More features regarding leader shortcuts.