git rid of a few fixme