Table and key tweaks