small fixes to object adapter