Fix intermittent failures