Better handling of shortcuts