Additional fixes, but still facing sync bug