Some last bits from the fork.