Fixed some barcode problems