Fix some FIXMEs.