Fixes on cli script