Fixed a couple of todos