Fix small race potential
Update common