runner: Various fixes