More separate runtime fixes