Removed http dependency from server
Minor fixes