[Base] HW keys tweaks