Fix two FIXMEs.