Day 26 and Day 25 fixes