Addressing a couple of todos.