Some more content fixes