fixes

QC fixes