Update a few TODO annotations