Add uniquify + erc helpers + some fixes