Fix a few notes

Move an import and re-add a TODO note.