Fixed all but one last issue with the server daemon