Fixes in the upstreamer to include current method