03 May 2018 - QC fixes