Resolved a few TODOs