Fixes on cli