Tidying up various TODOs