Minor fixes. Extract runners.