Remove race conditions

Autodeploy had bad race conditions, but no more.