Fixing ordering issue with waits (should resolve the unmatched sends/receives error with traces like minife)