Unity compatibility required updating some linq queries and reverting ToString changes