Address simple issues raised in PR