small changes to CSW Adapter