Fixes per Seth's comments