cli: Fixed a few issues with sample counts