Command parsing bugfixes