fixes in adapters