More tweaking of Key Actions