Some minor fix for Runner