fixes for OptYield paper