Some changes from PR review