Couple of fixes to the .xkb.