Some server bug fix