Minor Content*Manager changes