more X11 fixes
Merge branch 'master' of github.com:wesselsga/reno