Fixes to xkbcomp invocation