Fixed all sync issues