Improvements to QC

Also fixing issues noticed during improving QC