CRM-12967, barcode position fixes