Try to fix sync issues (codeaurora)