Some QCOM changes