Fix issues surrounding media blocks