Commands: Fix command ids correctly this time