Fix a few TODOs