Minor stuff + add request server everywhere in the logs