Clear Key tweaks