Fix TODO comments