Adapter fixes.