Runtime improvements