Runtime improvements part 3.