Fix some issues with ListCommand