Fixes for upstream API breakage regarding proxy