Minor TODO Comments