Fixups to adapter