Fix adapter refs again