Slight key tweaks