Fixed issues in server def