Adapter fixes