various fixes for the ObjectAdapter