Fix remaining files.