CLI tools fix
Few updates