Further SMP modification. STILL not compileable