Review fixes, made sure old key combos aren't cached