cross server problems fixed