Fixed server stuff

Fixed server stuff