Correct a couple of todos