Fixed config deps
Handle longs as well as ints for arbitration IDs