CI seems to go better with some built-in waiting