Further key tweaks