adapter fixes