Address Ben and Jesse's comments on first patch