fixed some adapter stuff
Merge branch 'adapter-fix'