Minor fixes in runner