Worked on FIXME notes.