Some fixups from David's comments