Fixes based on review w/ stephen