couple of FIXME comments