Adding fixes from QC checklist