Changes to TODO comments