Merge in MODKEY changes