Revert "Revert "Fix content/type warnings""
Revert "Revert "Fix content/type warnings""

This reverts commit 833f617761e328ceee73edcbf53233a86c57311f.

fw42/cubecomp,fw42/cubecomp,fw42/cubecomp,fw42/cubecomp