Code review comment fixes