More adjustments from qcom init scripts