Fixups per Yuvi's notes