Add a couple more TODOs