Minor changes due to changed runnables