QC fixes