updates for cmucl compatibility