Fix a leak with forwarderLookup + misc. fixes