Fix main fixes.