fixes in adaptor