Fixed content issues and problem from broken merge