Misc TODO notes