Minor bug fixes Server