fix some todos

Change-Id: I242d04d64c019303f5a669a8f59898b5c626a1f2