small issues on server close fixed