Update FIXME comments