Fixed QC concerns