Fixes to runner