FIX: additional HTML fixes.