fix some FIXME