Fixed build issues related to sync getting merged into std