Fixes syncing bugs
Pre merge commit
Merge