Minor enhancement about cli and logs