Added a couple of covenience TODOs