REST adapter fixes