fixes for Content module