Fix up keylayout