Fixes to CLI