Improve make_req to work for most cases