some fixes for now inqp shawn experiments