Small changes to help progress us closer to relayer support --------- Co-authored-by: Facundo Farall <37149322+ffarall@users.noreply.github.com>