Fixed some CLI details