More work to stabilize runtime