syncing fixes -> server