barcode and hotkeys fixes