add couple corrections on requestor side, version with weird linker error