CS/mess detector fixes.
Added to do adapters.