Add a few TODOs after CR.