Runner fixes