Replaced some TODO by FIXME

closes #17478