Added a few TODO notices for 1.8.