resource adapter fixes