Minor tuning of shortcuts