More work on proper forwarding