I had a D-II with both the condenser head and the old acetate Chromega. The Chromega had better provision for mitigating light leaks at the head/carrier interface, but both heads leaked enough to be of concern. My D-5 seems to have corrected most of these problems but I will not fully know for a couple of weeks until I get her really set up. If I were to dive in on baffling I would start with some brass shim stock (k&S) from your local hobby shop and some black spray paint.