Fix basic server diff