[CMAKE] Some arm cmake fixes