Handling a few TODOs