Porting more algorithms to new scheme, adding missing forwarding headers