cli change fixes