Model checking fixes.