Contained entity fixes.