Fixes for the clean content.