Tweaked some TODO comments