Reviewing 76340f9; minor comments