Fixed up a few TODOs