- Fix some synchronization issues and remove some TODOs