Fixes to create upstream dynode-proxy