Strict mode fixes to adapter