Runtime related fixes.