ENH: fixes from DO box