Commands: Fix command ids