Adding a couple of todos for the next fix