Wait for scheduled builds

...and make extra guard