Improve knife-solo support in knife command