Update to latest tocgen