Addressing minor comments from Alex