Round 4 fixes.