Fixes in Contentelements