Addressed a few TODOs.