Runtime improvements part 2.