Make sure no-shortcut-map is updated (plus debug)