Wcn36xx adhoc 2

Ad-Hoc related fixes.