Fix up a few runtime components.