Fix issues with Xmodmap