Fix machine entities for ARC