*8995* Correct warnings; facilitate OMP review model testing