Couple more TODOs