Sort out a couple more things on the TODO