compilation (but not z2_slow linking) fixed