Get the BPAN server working better