Fix the server with the new var struct