Fix compilation issues post sync