Updates to make the cli work