Fix builds errors when not all 3 architectures are built