Add missing FIXMEs. Remove already resolved FIXME.