Adding some requires to make the first run more reliable