Fixed some content issues