Fix ARM conditional builds