Massive error fix sweep