more fixes to ObjectAdapter