Fix per Jeff's comments