Using latest fixes from XPCKit subrepository