review comment fixes