Correct Server Close issues