Strict mode fixes to adapter

A couple of minor fixes to our last batch of work.