Fixed waiton runner issues