Some fixes around barcode command formatting