Some load error clean up, kits still need to be fixed.