Several nested content fixes