SN or barcode review fixes