Review fixes. Account for objects as well