adaptor fixes