Simple fixes suggested by the enumerator.