final eom bucket fixes