ScarlettGatelyMoore Fix multiarch