add baseline and fix GemStone problem