Round 5 fixes.