Fix content issues