Add include blockers and other corrections.