Fix invalid command messages