Minor bug fixes in data server