Fix keyless command parsing