Few fixes for sync issues.