Handle a few TODOs