Fixes for content plugin