fixing residual server issues