Doc updates, handling of bare objects