Add a couple of TODO comments