Fixed some FIXMEs.