Fixes with hardware keys