Removed qjson.
Removed qca.
[upstream] Some minor fixes.