more QC fixes