some fixes in runner