Minor content manager fixes