Resolve part of a fixme and add a new one.