custom runner fixes