Fix qi/qitype dependency inconsistency