Server bugs correction p1