ShellKeySupport fixes