Fixed few bugs in adapters