Fixed some stuff for qcom device on patch set 2