fixed map server leaks