more fixes for hardware keys