Update from CM to fix build