Fix issues with content