Fixes corresponding to Ed's comments