CLI: minor bugfixes