Minor cleanups
Merge branch 'master' into latin1-xf86